Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge v2-main branch into main #87

Merged
merged 41 commits into from
Jan 9, 2024
Merged

Merge v2-main branch into main #87

merged 41 commits into from
Jan 9, 2024

Conversation

cormacpayne
Copy link
Member

Merges the latest changes from the v2-main branch (containing the v2 release with the TypeScript conversion + additional changes) into main.

snehapar9 and others added 30 commits October 17, 2023 13:35
* Convert docker action to typescript

* Add step to delete container app env back

* Remove workflow_dispatch

* Remove commented out code

* Fix formating

* Update image name

* Address PR comments

* Remove reference to Command Helper

* Address PR comments

* Remove commented code

* ci: add Azure Static Web Apps workflow file
on-behalf-of: @Azure [email protected]

* Delete .github/workflows/azure-static-web-apps-ashy-ocean-015179e0f.yml

* Update Azure CLI extensions installation

* Await setupAzureCli

* Refactor and trigger pipeline

* Refactor TelemetryHelper

* Reformat and remove new line

* Refactor and re-trigger pipeline

* Address PR comments

* Address PR comments

* Change comment for build-specific properties

* Refactor default containerapp name

* Change command construction

* Change command signature

* Fix command to get runtime stack

* Fix oryx dockerfile command to get runtime stack

* Fix oryx dockerfile command to get runtime stack

* Fix command to set default builder

* Test containerapp creation

* Hard code location and re-trigger pipeline

* Re-trigger pipeline and test

* Fix docker push command

* Address PR comments

* Fix formating for oryx dockerfile command

* Add double quotes

* Address PR comments

* Change executeAndThrowIfError to execute

* Support registry arguments

* Updated index.js

* Fix docker login command

* Re-order container registry authentication

* Add space
* Migrate latest changes from v1 to v2

* Support build arguments for Dockerfile and builder scenario

* Fix typo in docs
* Initial commit to support private registry scenario

* Add global var to delegate build to CLI

* Update condition to use CLI

* Fix formatting

* Update validation for internal registry scenario

* Address PR comments

* Update condition to use internal registry

* Test validation for internal registry scenario

* Get value of imageToBuild before build

* Fetch imageToBuild arg and test

* Move code to fetch imageToBuild in validation

* Install extension

* Trigger pipeline

* Re-trigger pipeline to install extensions

* Re-trigger pipeline to isntall extension

* Install extension and re-trigger pipeline

* Explicitly install extension

* Trigger pipeline

* Re-trigger pipeline

* Change whl name

* Fix pipeline failure and re-trigger

* Fix pipeline failures

* Install extension explicitly

* Fix valiation failures

* Fix validation failures

* Test validation failures

* Test validation failures

* Remove location

* Test validation pipeline

* Test validation pipeline

* Test validation pipeline

* Test validation pipeline

* Test validation pipeline

* Trigger validation pipeline

* Test validation pipeline

* Address validation failures

* Address PR discussion comments

* Made `imageToDeploy` optional

* Remove step to install whl

* Address PR comments

* Addressed PR comments

* Fix typo

* Remove space

* Fix merge failure

* Remove --debug

* Test registry scenario

* Fix merge failures and re-trigger pipeline

* Add --debug

* Create containerapp with up

* Create container app with up

* Trigger validation pipeline

* Test container app creation with up

* Add location to up command

* Use up for just private registry scenario

* Change rg for update scenario

* Remove step to delete pushed image

* Test containerapp update with up

* Hardcode location to northcentralusstage

* Remove app source path

---------

Co-authored-by: Cormac McCarthy <[email protected]>
* Remove env as a required arg

* Add index.js

* Address PR comments

* Remove env param
Update targeted builders to 20231107.2
* Snap to containerapp version 0.3.43

* Modify update command

* Comment out imageToDeploy

* Add --debug to the update command

* Comment out `--source`

* Enable build and push from ghs

* Build and push from gha

* Ensuer -i and --source are not used together

* Fix typo

* Revert comment

* Add global var to determine cloud build scenario
* Remove location

* Change logic to set location

* Check if env is provided

* Fix logic to set location

* Update logic to set location

* Add comments

* Remove space

* Remove location param

* Remove location

* Refactor

* Reorder arguments

* Address PR comments

* Fix typo

* Fix typo

* Fix PR comments

* Address PR comments

* Revert change to set this.containerrAppExists

* Refactor

* Add comment

* Change validation pipeline name
This reverts commit 6cecedf.
This reverts commit 6cecedf.
@cormacpayne cormacpayne merged commit 6537c41 into main Jan 9, 2024
28 of 29 checks passed
@cormacpayne cormacpayne deleted the v2-main branch January 9, 2024 22:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants